Padding review

Ensure that the class structs of all subclassable
types have sufficient padding (standardizing on 8
slots, here).

GtkBox
GtkButton
GtkDrawingArea
GtkFixed
GtkFrame

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index eb5146a15f07b253fd1e885c670f10d0add11653..55ccb584da7018eb024b96b2a7568de6ef7ede51 100644 (file)
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -62,11 +62,7 @@ struct _GtkBoxClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index c6a31b64ca2821243ebaa4dc8ceb240dfce7d71d..f3738f916635e330730a17747ff44ebfaf38881d 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -70,11 +70,7 @@ struct _GtkButtonClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 56e295c148fe4eed1454bf45d7e204432421c3d3..47cd8df6225e23776b65b38fc962d3865737296f 100644 (file)
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -75,11 +75,9 @@ struct _GtkDrawingAreaClass
 {
   GtkWidgetClass parent_class;
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  /*< private >*/
+
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 312719343923fdd5239fb73f7ab60b3a5794f97e..539dfed9705a763d4e8549916b72e1ece25f2ab4 100644 (file)
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -54,11 +54,9 @@ struct _GtkFixedClass
 {
   GtkContainerClass parent_class;
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  /*< private >*/
+
+  gpointer padding[8];
 };
 
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 761725dcca923d9064945211cf2eab0494f1dd02..a02a3c8323dc2c3cb76e5b4c0e4f83fee9c61709 100644 (file)
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -67,11 +67,7 @@ struct _GtkFrameClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };